bitkeeper revision 1.1159.1.523 (41d54b30O4rbtOVTyJB2Od7jzSW30g)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Fri, 31 Dec 2004 12:50:56 +0000 (12:50 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Fri, 31 Dec 2004 12:50:56 +0000 (12:50 +0000)
commit31f272cb5b61db4c7a596a277e4a2a9b22038a51
tree9ae329d19ccf6d46fd677f819eaab821d090c928
parentd05311de76f03f0187ef9ac77f7a537e88b6d529
parentb7d997bf6bdd78974eae758d13e0460abd7c9cd7
bitkeeper revision 1.1159.1.523 (41d54b30O4rbtOVTyJB2Od7jzSW30g)

manual merge
.rootkeys
linux-2.6.10-xen-sparse/arch/xen/configs/xen0_defconfig
linux-2.6.10-xen-sparse/arch/xen/i386/Kconfig
linux-2.6.10-xen-sparse/arch/xen/i386/kernel/Makefile
xen/arch/x86/dom0_ops.c
xen/include/asm-x86/processor.h
xen/include/public/dom0_ops.h